From 121068390b8b1f4e72740cbcd9c02e3508c64d1a Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Thu, 28 Apr 2005 21:43:58 +0000 Subject: [PATCH] bitkeeper revision 1.1159.258.109 (4271591efy8CDaEUexiC4RrOlWxDNg) Backport of bugfix to ensure that p2m entries are invalidated before returning memory back to Xen allocation pool. Signed-off-by: Keir Fraser --- linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c index 022831606a..6c223c79e1 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/hypervisor.c @@ -378,7 +378,8 @@ unsigned long allocate_empty_lowmem_region(unsigned long pages) pte = pte_offset_kernel(pmd, (vstart + (i*PAGE_SIZE))); pfn_array[i] = pte->pte_low >> PAGE_SHIFT; queue_l1_entry_update(pte, 0); - phys_to_machine_mapping[__pa(vstart)>>PAGE_SHIFT] = INVALID_P2M_ENTRY; + phys_to_machine_mapping[(__pa(vstart)>>PAGE_SHIFT)+i] = + INVALID_P2M_ENTRY; } /* Flush updates through and flush the TLB. */ -- 2.30.2